From 2bc69bd7d92cfc27e8fac4dcea7f4d71a1a5038c Mon Sep 17 00:00:00 2001 From: "kaf24@localhost.localdomain" Date: Tue, 30 Jan 2007 13:52:52 +0000 Subject: [PATCH] new domain builder fix to boot domU on IA64. Signed-off-by: Isaku Yamahata --- tools/libxc/xc_dom_boot.c | 50 +++++++++++++++++++++++++++++++++++++-- tools/libxc/xc_dom_ia64.c | 11 ++++++--- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_dom_boot.c b/tools/libxc/xc_dom_boot.c index 44d46e3f66..d8bfe485d8 100644 --- a/tools/libxc/xc_dom_boot.c +++ b/tools/libxc/xc_dom_boot.c @@ -157,6 +157,12 @@ static int arch_setup_early(struct xc_dom_image *dom) return rc; } +static int arch_setup_middle(struct xc_dom_image *dom) +{ + xc_dom_printf("%s: doing nothing\n", __FUNCTION__); + return 0; +} + static int arch_setup_late(struct xc_dom_image *dom) { static const struct { @@ -258,6 +264,12 @@ static int arch_setup_late(struct xc_dom_image *dom) #elif defined(__ia64__) static int arch_setup_early(struct xc_dom_image *dom) +{ + xc_dom_printf("%s: doing nothing\n", __FUNCTION__); + return 0; +} + +static int arch_setup_middle(struct xc_dom_image *dom) { DECLARE_DOMCTL; int rc; @@ -268,16 +280,35 @@ static int arch_setup_early(struct xc_dom_image *dom) domctl.cmd = XEN_DOMCTL_arch_setup; domctl.domain = dom->guest_domid; domctl.u.arch_setup.flags = 0; + + /* dom->start_info_pfn should be initialized by alloc_magic_pages(). + * However it is called later. So we initialize here. + */ + dom->start_info_pfn = dom->total_pages - 3; domctl.u.arch_setup.bp = (dom->start_info_pfn << PAGE_SHIFT) + sizeof(start_info_t); - domctl.u.arch_setup.maxmem = dom->total_pages << PAGE_SHIFT; + /* 3 = start info page, xenstore page and console page */ + domctl.u.arch_setup.maxmem = (dom->total_pages - 3) << PAGE_SHIFT; rc = do_domctl(dom->guest_xc, &domctl); return rc; } static int arch_setup_late(struct xc_dom_image *dom) { - xc_dom_printf("%s: doing nothing\n", __FUNCTION__); + unsigned int page_size = XC_DOM_PAGE_SIZE(dom); + shared_info_t *shared_info; + + /* setup shared_info page */ + xc_dom_printf("%s: shared_info: mfn 0x%" PRIpfn "\n", + __FUNCTION__, dom->shared_info_mfn); + shared_info = xc_map_foreign_range(dom->guest_xc, dom->guest_domid, + page_size, + PROT_READ | PROT_WRITE, + dom->shared_info_mfn); + if (NULL == shared_info) + return -1; + dom->arch_hooks->shared_info(dom, shared_info); + munmap(shared_info, page_size); return 0; } @@ -292,6 +323,12 @@ static int arch_setup_early(struct xc_dom_image *dom) return 0; } +static int arch_setup_middle(struct xc_dom_image *dom) +{ + xc_dom_printf("%s: doing nothing\n", __FUNCTION__); + return 0; +} + static int arch_setup_late(struct xc_dom_image *dom) { start_info_t *si = @@ -324,6 +361,12 @@ static int arch_setup_early(struct xc_dom_image *dom) return 0; } +static int arch_setup_middle(struct xc_dom_image *dom) +{ + xc_dom_printf("%s: doing nothing\n", __FUNCTION__); + return 0; +} + static int arch_setup_late(struct xc_dom_image *dom) { xc_dom_printf("%s: doing nothing\n", __FUNCTION__); @@ -395,6 +438,9 @@ int xc_dom_boot_mem_init(struct xc_dom_image *dom) return rc; } + if (0 != (rc = arch_setup_middle(dom))) + return rc; + return 0; } diff --git a/tools/libxc/xc_dom_ia64.c b/tools/libxc/xc_dom_ia64.c index 7214c3c299..c6e4424515 100644 --- a/tools/libxc/xc_dom_ia64.c +++ b/tools/libxc/xc_dom_ia64.c @@ -26,7 +26,11 @@ static int alloc_magic_pages(struct xc_dom_image *dom) /* allocate special pages */ dom->console_pfn = dom->total_pages -1; dom->xenstore_pfn = dom->total_pages -2; - dom->start_info_pfn = dom->total_pages -3; + + /* + * this is initialized by arch_setup_middle(). + * dom->start_info_pfn = dom->total_pages -3; + */ return 0; } @@ -39,6 +43,7 @@ static int start_info_ia64(struct xc_dom_image *dom) xc_dom_printf("%s\n", __FUNCTION__); + memset(start_info, 0, sizeof(*start_info)); sprintf(start_info->magic, dom->guest_type); start_info->flags = dom->flags; start_info->nr_pages = dom->total_pages; @@ -54,12 +59,12 @@ static int start_info_ia64(struct xc_dom_image *dom) bp->initrd_start = start_info->mod_start; bp->initrd_size = start_info->mod_len; } + bp->command_line = (dom->start_info_pfn << PAGE_SHIFT_IA64) + + offsetof(start_info_t, cmd_line); if (dom->cmdline) { strncpy((char *)start_info->cmd_line, dom->cmdline, MAX_GUEST_CMDLINE); start_info->cmd_line[MAX_GUEST_CMDLINE - 1] = '\0'; - bp->command_line = (dom->start_info_pfn << PAGE_SHIFT_IA64) - + offsetof(start_info_t, cmd_line); } return 0; } -- 2.30.2